Add 0015-coding.c-produce_chars-Fix-updating-of-src_end-Bug-1.patch.

Incorporate upstream fix to prevent Emacs from crashing while decoding
input with DOS EOLs.

diff --cc debian/.git-dpm
index 91a1e8206c08548882eb45a6ef7b70e5ae8ee90b,0000000000000000000000000000000000000000..775ffeb1b4337b6a99ace1ff0fb4e753fe1e7a2f
mode 100644,000000..100644
--- 1/debian/.git-dpm
--- /dev/null
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
- 847d5d949a989ad15308ab56ec8a9ec7fd2dc2d1
- 847d5d949a989ad15308ab56ec8a9ec7fd2dc2d1
 +# see git-dpm(1) from git-dpm package
++910975a324eddfbc55751b6ccf2d04000239063e
++910975a324eddfbc55751b6ccf2d04000239063e
 +4edc7f7569f39278c30a9a64da6e0b313bbed458
 +4edc7f7569f39278c30a9a64da6e0b313bbed458
 +emacs23_23.4+1.orig.tar.bz2
 +155466351ad8e2e10af8a1f7f23af0a801cf7db2
 +23111569

diff --cc debian/patches/0015-coding.c-produce_chars-Fix-updating-of-src_end-Bug-1.patch
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..a74b2c14f754b99e6e3d9aa3f45085dc10ffbe0b
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/patches/0015-coding.c-produce_chars-Fix-updating-of-src_end-Bug-1.patch
@@@ -1,0 -1,0 +1,58 @@@
++From 910975a324eddfbc55751b6ccf2d04000239063e Mon Sep 17 00:00:00 2001
++From: Kenichi Handa <handa@m17n.org>
++Date: Wed, 8 Feb 2012 17:31:05 +0900
++Subject: coding.c (produce_chars): Fix updating of src_end (Bug#10701).
++
++Emacs should no longer crash while decoding input with DOS EOLs.
++
++Applied-By: Rob Browning <rlb@defaultvalue.org>
++Origin: upstream, commit: 77a56e3d815991289bbae393af4821ddaf0b5b7a
++Bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=10701
++---
++ src/ChangeLog |    4 ++++
++ src/coding.c  |    6 +++---
++ 2 files changed, 7 insertions(+), 3 deletions(-)
++
++diff --git a/src/ChangeLog b/src/ChangeLog
++index e1f24d1..ed4dcf6 100644
++--- a/src/ChangeLog
+++++ b/src/ChangeLog
++@@ -1,3 +1,7 @@
+++2012-02-08  Kenichi Handa  <handa@m17n.org>
+++
+++     * coding.c (produce_chars): Fix updating of src_end (Bug#10701).
+++
++ 2012-01-25  Chong Yidong  <cyd@gnu.org>
++ 
++      * Version 23.4 released.
++diff --git a/src/coding.c b/src/coding.c
++index 8e96db1..c0393e7 100644
++--- a/src/coding.c
+++++ b/src/coding.c
++@@ -7038,7 +7038,7 @@ produce_chars (coding, translation_table, last_block)
++                        dst_end = coding->destination + coding->dst_bytes;
++                        coding_set_source (coding);
++                        src = coding->source + offset;
++-                       src_end = coding->source + coding->src_bytes;
+++                       src_end = coding->source + coding->consumed;
++                        if (EQ (coding->src_object, coding->dst_object))
++                          dst_end = (unsigned char *) src;
++                      }
++@@ -7072,7 +7072,7 @@ produce_chars (coding, translation_table, last_block)
++                      dst_end = coding->destination + coding->dst_bytes;
++                      coding_set_source (coding);
++                      src = coding->source + offset;
++-                     src_end = coding->source + coding->src_bytes;
+++                     src_end = coding->source + coding->consumed;
++                      if (EQ (coding->src_object, coding->dst_object))
++                        dst_end = (unsigned char *) src;
++                    }
++@@ -7093,7 +7093,7 @@ produce_chars (coding, translation_table, last_block)
++                dst = alloc_destination (coding, require, dst);
++                coding_set_source (coding);
++                src = coding->source + offset;
++-               src_end = coding->source + coding->src_bytes;
+++               src_end = coding->source + coding->consumed;
++              }
++          }
++        produced_chars = coding->consumed_char;

diff --cc debian/patches/series
index 4a8121ade07b8eb7dbd5bb65de6fe9a3927e614e,0000000000000000000000000000000000000000..c5777994704350a700eaf8ce83a37c8113b3c7d5
mode 100644,000000..100644
--- 1/debian/patches/series
--- /dev/null
+++ b/debian/patches/series
@@@ -1,14 -1,0 +1,15 @@@
 +0001-Prefer-usr-share-info-emacs-23-over-usr-share-info.patch
 +0002-Run-debian-startup-and-set-debian-emacs-flavor.patch
 +0003-Remove-files-that-appear-to-be-incompatible-with-the.patch
 +0004-Adjust-documentation-references-for-Debian.patch
 +0005-Cause-the-build-to-fail-if-liblockfile-isn-t-selecte.patch
 +0006-Avoid-silently-losing-mail-via-fakemail.patch
 +0007-Modify-the-output-of-version-to-indicate-Debian-modi.patch
 +0008-Look-for-NEWS-in-order-to-find-etc-rather-than-GNU.patch
 +0009-Invoke-the-correct-xmlstarlet-executable-on-Debian-s.patch
 +0010-Fix-startup-hang-on-Debian-GNU-kFreeBSD.patch
 +0011-Use-CRT_DIR-to-find-crt-.o-on-ppc64.patch
 +0012-Define-POSIX_SIGNALS-for-GNU-Hurd.patch
 +0013-Add-a-printf-attribute-to-movemail.c-to-allow-harden.patch
 +0014-Fix-hang-after-C-z-in-gnome-shell.patch
++0015-coding.c-produce_chars-Fix-updating-of-src_end-Bug-1.patch